From 7542255d5c90b907016b8e2cb84ccb82af809181 Mon Sep 17 00:00:00 2001 From: Tycho Date: Sat, 13 Dec 2014 22:09:37 +0000 Subject: Clang needs the libstdc++ that comes with gcc-4.8 --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index eaf8f116a..26e74c1b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,14 @@ before_install: - if [ "$TRAVIS_MCSERVER_BUILD_TYPE" == "COVERAGE" ]; then sudo pip install cpp_coveralls; fi # g++4.8 - - if [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - - if [ "$CXX" == "g++" ]; then sudo apt-get update -qq; fi + - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + - sudo apt-get update -qq install: + # g++4.8 and clang + - sudo apt-get install -qq g++-4.8 + # g++4.8 - - if [ "$CXX" == "g++" ]; then sudo apt-get install -qq g++-4.8; fi - if [ "$CXX" == "g++" ]; then export CXX="g++-4.8"; export CC="gcc-4.8"; fi # Build MCServer -- cgit v1.2.3